*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25f6029b0a6f68c1ceedae6639755b8a56aac9ff..3e6765221df434009e7eb2ecbc1f2d83999024f4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
        * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.
        Use minibuffer menu prompt for the `=' prefix.
        (smerge-command-prefix): Change default to C-^.
+       (smerge-mode): Don't assume font-lock doesn't move point.
 
        * skeleton.el (skeleton-internal-1): Make sure the first line of
        the region is also re-indented.